merge the imagemagick branch to trunk
authorJoakim <joakim@localhost.localdomain>
Thu, 19 Aug 2010 07:35:40 +0000 (09:35 +0200)
committerJoakim <joakim@localhost.localdomain>
Thu, 19 Aug 2010 07:35:40 +0000 (09:35 +0200)

Trivial merge